Autogenerated HTML docs for v2.1.2-451-g98349
diff --git a/gitcvs-migration.html b/gitcvs-migration.html index 6be45fd..f02a4a8 100644 --- a/gitcvs-migration.html +++ b/gitcvs-migration.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.6.6" /> +<meta name="generator" content="AsciiDoc 8.6.9" /> <title>gitcvs-migration(7)</title> <style type="text/css"> /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ @@ -87,10 +87,16 @@ ul > li { color: #aaa; } ul > li > * { color: black; } -pre { +.monospaced, code, pre { + font-family: "Courier New", Courier, monospace; + font-size: inherit; + color: navy; padding: 0; margin: 0; } +pre { + white-space: pre-wrap; +} #author { color: #527bbd; @@ -219,7 +225,7 @@ } div.imageblock div.content { padding-left: 0; } -span.image img { border-style: none; } +span.image img { border-style: none; vertical-align: text-bottom; } a.image:visited { color: white; } dl { @@ -349,7 +355,7 @@ margin-bottom: 0.1em; } -div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { +div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { margin-top: 0; margin-bottom: 0; } @@ -407,18 +413,14 @@ span.overline { text-decoration: overline; } span.line-through { text-decoration: line-through; } +div.unbreakable { page-break-inside: avoid; } + /* * xhtml11 specific * * */ -tt { - font-family: monospace; - font-size: inherit; - color: navy; -} - div.tableblock { margin-top: 1.0em; margin-bottom: 1.5em; @@ -452,12 +454,6 @@ * * */ -.monospaced { - font-family: monospace; - font-size: inherit; - color: navy; -} - table.tableblock { margin-top: 1.0em; margin-bottom: 1.5em; @@ -537,6 +533,8 @@ @media print { body.manpage div#toc { display: none; } } + + </style> <script type="text/javascript"> /*<+'])'); + var re = new RegExp('[hH]([1-'+(toclevels+1)+'])'); // Function that scans the DOM tree for header elements (the DOM2 // nodeIterator API would be a better technique but not supported by all // browsers). @@ -610,7 +608,7 @@ var i; for (i = 0; i < toc.childNodes.length; i++) { var entry = toc.childNodes[i]; - if (entry.nodeName == 'div' + if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") && entry.getAttribute("class").match(/^toclevel/)) tocEntriesToRemove.push(entry); @@ -656,7 +654,7 @@ var entriesToRemove = []; for (i = 0; i < noteholder.childNodes.length; i++) { var entry = noteholder.childNodes[i]; - if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote") + if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote") entriesToRemove.push(entry); } for (i = 0; i < entriesToRemove.length; i++) { @@ -776,13 +774,13 @@ repository over ssh with:</p></div> <div class="listingblock"> <div class="content"> -<pre><tt>$ git clone foo.com:/pub/repo.git/ my-project -$ cd my-project</tt></pre> +<pre><code>$ git clone foo.com:/pub/repo.git/ my-project +$ cd my-project</code></pre> </div></div> <div class="paragraph"><p>and hack away. The equivalent of <em>cvs update</em> is</p></div> <div class="listingblock"> <div class="content"> -<pre><tt>$ git pull origin</tt></pre> +<pre><code>$ git pull origin</code></pre> </div></div> <div class="paragraph"><p>which merges in any work that others might have done since the clone operation. If there are uncommitted changes in your working tree, commit @@ -795,7 +793,7 @@ <td class="content"> <div class="paragraph"><p>The <em>pull</em> command knows where to get updates from because of certain configuration variables that were set by the first <em>git clone</em> -command; see <tt>git config -l</tt> and the <a href="git-config.html">git-config(1)</a> man +command; see <code>git config -l</code> and the <a href="git-config.html">git-config(1)</a> man page for details.</p></div> </td> </tr></table> @@ -804,23 +802,23 @@ your changes, and then using the <em>git push</em> command:</p></div> <div class="listingblock"> <div class="content"> -<pre><tt>$ git push origin master</tt></pre> +<pre><code>$ git push origin master</code></pre> </div></div> <div class="paragraph"><p>to "push" those commits to the shared repository. If someone else has updated the repository more recently, <em>git push</em>, like <em>cvs commit</em>, will complain, in which case you must pull any changes before attempting the push again.</p></div> <div class="paragraph"><p>In the <em>git push</em> command above we specify the name of the remote branch -to update (<tt>master</tt>). If we leave that out, <em>git push</em> tries to update +to update (<code>master</code>). If we leave that out, <em>git push</em> tries to update any branches in the remote repository that have the same name as a branch in the local repository. So the last <em>push</em> can be done with either of:</p></div> <div class="listingblock"> <div class="content"> -<pre><tt>$ git push origin -$ git push foo.com:/pub/project.git/</tt></pre> +<pre><code>$ git push origin +$ git push foo.com:/pub/project.git/</code></pre> </div></div> <div class="paragraph"><p>as long as the shared repository does not have any branches -other than <tt>master</tt>.</p></div> +other than <code>master</code>.</p></div> </div> </div> <div class="sect1"> @@ -835,10 +833,10 @@ it:</p></div> <div class="listingblock"> <div class="content"> -<pre><tt>$ mkdir /pub/my-repo.git +<pre><code>$ mkdir /pub/my-repo.git $ cd /pub/my-repo.git $ git --bare init --shared -$ git --bare fetch /home/alice/myproject master:master</tt></pre> +$ git --bare fetch /home/alice/myproject master:master</code></pre> </div></div> <div class="paragraph"><p>Next, give every team member read/write access to this repository. One easy way to do this is to give all the team members ssh access to the @@ -849,7 +847,7 @@ writable by that group:</p></div> <div class="listingblock"> <div class="content"> -<pre><tt>$ chgrp -R $group /pub/my-repo.git</tt></pre> +<pre><code>$ chgrp -R $group /pub/my-repo.git</code></pre> </div></div> <div class="paragraph"><p>Make sure committers have a umask of at most 027, so that the directories they create are writable and searchable by other group members.</p></div> @@ -864,7 +862,7 @@ of the project you are interested in and run <a href="git-cvsimport.html">git-cvsimport(1)</a>:</p></div> <div class="listingblock"> <div class="content"> -<pre><tt>$ git cvsimport -C <destination> <module></tt></pre> +<pre><code>$ git cvsimport -C <destination> <module></code></pre> </div></div> <div class="paragraph"><p>This puts a Git archive of the named CVS module in the directory <destination>, which will be created if necessary.</p></div> @@ -872,9 +870,9 @@ cvsimport can average some twenty revisions per second, so for a medium-sized project this should not take more than a couple of minutes. Larger projects or remote repositories may take longer.</p></div> -<div class="paragraph"><p>The main trunk is stored in the Git branch named <tt>origin</tt>, and additional +<div class="paragraph"><p>The main trunk is stored in the Git branch named <code>origin</code>, and additional CVS branches are stored in Git branches with the same names. The most -recent version of the main trunk is also left checked out on the <tt>master</tt> +recent version of the main trunk is also left checked out on the <code>master</code> branch, so you can start adding your own changes right away.</p></div> <div class="paragraph"><p>The import is incremental, so if you call it again next month it will fetch any CVS updates that have been made in the meantime. For this to @@ -933,7 +931,7 @@ <a href="gittutorial-2.html">gittutorial-2(7)</a>, <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>, <a href="gitglossary.html">gitglossary(7)</a>, -<a href="everyday.html">Everyday Git</a>, +<a href="giteveryday.html">giteveryday(7)</a>, <a href="user-manual.html">The Git User’s Manual</a></p></div> </div> </div> @@ -947,7 +945,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-03-14 14:59:49 PDT +Last updated 2014-10-16 14:29:57 PDT </div> </div> </body> 